Merge version 1.229+rpi1 and 1.230 to produce 1.230+rpi1

diff --cc debian/changelog
index f48dce394800d09600ccf524be6c763499891fb8,bd374c4fd77742b0dd7f7efb18cce99758a4e607..13b1aa21a43d23e57512b6ecd04cebadaaf5b7b0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- gcc-defaults (1.229+rpi1) forky-staging; urgency=medium
++gcc-defaults (1.230+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1.189+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 26 Sep 2020 14:33:38 +0000]
 +  * Build enough cross-compiler packages on armhf
 +    to support u-boot build.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Jan 2026 21:47:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 14 Feb 2026 19:07:47 +0000
++
+ gcc-defaults (1.230) unstable; urgency=medium
+ 
+   * Stop building multilibs on s390x.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 19 Jan 2026 17:28:52 +0100
  
  gcc-defaults (1.229) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge